From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 3 Dec 2008 07:25:56 +0000 (+0100)
Subject: Merge branch 'x86/io' into x86/iommu
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~24876^2~2^2~1
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=6083aa485c86933ee444dc2242270d37ea4664cb;p=linux-4.9.git

Merge branch 'x86/io' into x86/iommu

Merge x86/io into x86/iommu due to a small patch conflict in io.h.
---

6083aa485c86933ee444dc2242270d37ea4664cb